From: Raspbian automatic forward porter Date: Thu, 22 Jan 2026 00:48:19 +0000 (+0000) Subject: Merge version 1.9.25+dfsg3-1+rpi1 and 1.9.25+dfsg3-3 to produce 1.9.25+dfsg3-3+rpi1 X-Git-Tag: archive/raspbian/1.9.25+dfsg3-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=ca0b2dd75fd7cf726974fc662942906743699094;p=filament.git Merge version 1.9.25+dfsg3-1+rpi1 and 1.9.25+dfsg3-3 to produce 1.9.25+dfsg3-3+rpi1 --- ca0b2dd75fd7cf726974fc662942906743699094 diff --cc debian/changelog index c3cce15,9fbe57d..0d2dd91 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,19 +1,27 @@@ - filament (1.9.25+dfsg3-1+rpi1) trixie-staging; urgency=medium ++filament (1.9.25+dfsg3-3+rpi1) forky-staging; urgency=medium + + [changes brought forward from 1.9.25+dfsg2-4+rpi1 by Peter Michael Green at Sun, 27 Feb 2022 15:24:21 +0000] + * Build with clang 11 to hopefully avoid armv7 contamination. + * Fix clean target. + - -- Raspbian forward porter Thu, 20 Jun 2024 21:23:17 +0000 ++ -- Raspbian forward porter Thu, 22 Jan 2026 00:48:18 +0000 ++ + filament (1.9.25+dfsg3-3) unstable; urgency=medium + + * Add missing ImportExecutables-None.cmake to version control. + Thanks to Helmut Grohne (Closes: #1086159) + + -- Timo Röhling Thu, 04 Sep 2025 13:57:31 +0200 + + filament (1.9.25+dfsg3-2) unstable; urgency=medium + + * Force CMake policy version to supported minimum (Closes: #1112913) + * Fix build with imgui 1.92 (Closes: #1112494) + * Add NoTrack debian/watch. + We do not want to track upstream because we need this + particular version for Open3D. + + -- Timo Röhling Mon, 01 Sep 2025 17:32:11 +0200 filament (1.9.25+dfsg3-1) unstable; urgency=medium diff --cc debian/patches/series index 3d1bf2d,0785b14..299bf47 --- a/debian/patches/series +++ b/debian/patches/series @@@ -20,4 -20,4 +20,5 @@@ 0020-Fix-shebang-to-use-Python-3.patch 0021-Do-not-build-spirv-with-Werror.patch 0022-Fixups-for-spirv.patch + 0023-Fix-build-with-imgui-1.92.patch +auto-1.9.25+dfsg2-12+rpi1-4642f2afe8fe9adb140d2d29c4f5097b1dc46765-1696086414 diff --cc debian/rules index c609a9b,2d210c1..f49dc10 --- a/debian/rules +++ b/debian/rules @@@ -35,8 -35,9 +35,9 @@@ endi override_dh_auto_configure: dh_auto_configure -- \ - -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11 \ $(CMAKE_CROSS_COMPILING_OPTIONS) \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DIMPORT_EXECUTABLES_DIR=debian \ -DFILAMENT_SKIP_SAMPLES=ON \ -DFILAMENT_ENABLE_JAVA=OFF \